From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 18 Mar 2009 21:46:57 +0000 (+0000)
Subject: (rmail-retry-ignored-headers): Add usual mime headers.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1180
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a14abe4c95026d5ede0950b43b5f0eeee1a0931d;p=emacs.git

(rmail-retry-ignored-headers): Add usual mime headers.
(rmail-retry-failure): Undo previous change.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 32349dbb0f0..053f88629ff 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -371,7 +371,7 @@ If nil, display all header fields except those matched by
   :group 'rmail-headers)
 
 ;;;###autoload
-(defcustom rmail-retry-ignored-headers "^x-authentication-warning:"
+(defcustom rmail-retry-ignored-headers "^x-authentication-warning:\\|content-type:\\|content-transfer-encoding:\\|mime-version:"
   "Headers that should be stripped when retrying a failed message."
   :type '(choice regexp (const nil :tag "None"))
   :group 'rmail-headers)
@@ -3762,7 +3762,6 @@ specifying headers which should not be copied into the new message."
 	    (mail-sendmail-delimit-header)
 	    (save-restriction
 	      (narrow-to-region (point-min) (mail-header-end))
-	      (rmail-delete-headers rmail-ignored-headers)
 	      (rmail-delete-headers rmail-retry-ignored-headers)
 	      (rmail-delete-headers "^\\(sender\\|return-path\\|received\\):")
 	      (setq resending (mail-fetch-field "resent-to"))